From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 4 Jul 2012 15:46:39 +0000 (+0200)
Subject: recorder-src: Use normal GObject boilerplate
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6379
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f9dbe567856140610496103baa5dde87417da618;p=gnome-shell.git

recorder-src: Use normal GObject boilerplate

Gst will drop its own boilerplate in 1.0, so just use G_DEFINE_TYPE.

https://bugzilla.gnome.org/show_bug.cgi?id=679445
---

diff --git a/src/shell-recorder-src.c b/src/shell-recorder-src.c
index 55272980f..573ba3997 100644
--- a/src/shell-recorder-src.c
+++ b/src/shell-recorder-src.c
@@ -34,11 +34,10 @@ enum {
 /* Special marker value once the source is closed */
 #define RECORDER_QUEUE_END ((GstBuffer *)1)
 
-GST_BOILERPLATE(ShellRecorderSrc, shell_recorder_src, GstPushSrc, GST_TYPE_PUSH_SRC);
+G_DEFINE_TYPE(ShellRecorderSrc, shell_recorder_src, GST_TYPE_PUSH_SRC);
 
 static void
-shell_recorder_src_init (ShellRecorderSrc      *src,
-			 ShellRecorderSrcClass *klass)
+shell_recorder_src_init (ShellRecorderSrc      *src)
 {
   gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME);
 
@@ -47,11 +46,6 @@ shell_recorder_src_init (ShellRecorderSrc      *src,
   g_mutex_init (src->mutex);
 }
 
-static void
-shell_recorder_src_base_init (gpointer klass)
-{
-}
-
 static gboolean
 shell_recorder_src_memory_used_update_idle (gpointer data)
 {
@@ -146,7 +140,7 @@ shell_recorder_src_finalize (GObject *object)
 
   g_mutex_clear (src->mutex);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (shell_recorder_src_parent_class)->finalize (object);
 }
 
 static void